Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 06:26:01 +0000 (22:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 06:26:01 +0000 (22:26 -0800)

Trivial merge